Skip to content

Darkpack Pull 3/23/2026#27

Merged
FalloutFalcon merged 34 commits into
ApocryphaXIII:masterfrom
FalloutFalcon:darkpack-pull-3-23-26
Mar 23, 2026
Merged

Darkpack Pull 3/23/2026#27
FalloutFalcon merged 34 commits into
ApocryphaXIII:masterfrom
FalloutFalcon:darkpack-pull-3-23-26

Conversation

@FalloutFalcon

Copy link
Copy Markdown
Member

No description provided.

FalloutFalcon and others added 30 commits February 26, 2026 18:54
## About The Pull Request
Swaps the layer to under mobs instead of above (expect for diab aura as
it would otherwise be invisible, though its still kinda hard to see.)
## Why It's Good For The Game
The aura is really obstructive and makes characters really hard to read.
## Changelog
:cl:
qol: Auras now layer underneath the mob
/:cl:
## About The Pull Request
Fixed names not updating when they should be.

- [x] Fixes DarkPack13#484
- [x] Fixes DarkPack13#580
- [x] Fixes DarkPack13#513
- [x] Fixes DarkPack13#446
- [x] Fixes DarkPack13#447
- [x] Fixes DarkPack13#627

## Why It's Good For The Game
bugfix good

## Changelog
:cl:
fix: Fixed some guestbook related bugs
/:cl:

---------

Co-authored-by: thefinalnights-ci[bot] <210100325+thefinalnights-ci[bot]@users.noreply.github.com>
Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: Marshmellow105 <118340622+Marshmellow105@users.noreply.github.com>
Co-authored-by: buffyuwu <buffyvrc@gmail.com>
Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
## About The Pull Request
sorts all our verbs into one catagory.

<img width="518" height="146" alt="image"
src="https://github.com/user-attachments/assets/2c8c2414-9faa-46a8-854d-1506a9ea441a"
/>

## Why It's Good For The Game
DarkPack13#752 added this category and if we want it to exist it should be
applied/used for most of verbs.

## Changelog
:cl:
admin: All Second City verbs sorted into their own catagory
admin: Setting starlight is R_ADMIN instead of R_FUN
/:cl:

Co-authored-by: XeonMations <62395746+XeonMations@users.noreply.github.com>
…k13#789)

## About The Pull Request
<img width="597" height="478" alt="image"
src="https://github.com/user-attachments/assets/6b6740fe-6a3c-45c4-9e59-9c60a8e7ec34"
/>

## Why It's Good For The Game
Really common to tell somone "you should report this upstream" to
prevent us from having to manually upstream. This also makes sure that
when they do this, it still links back to said server for clarity.
Default option is the server your on, as without expertise its best to
still report it downstream first and let someone smarter decide to
upstream it.

## Changelog
:cl:
qol: You can now choose to report a bug upstream when making an issue
report
/:cl:
## About The Pull Request
Addes fishing supplies to the hardware and camping store. Camping store
(pictured on right) has more supplies/worms as you would expect it to be
better stocked then a hardware store.

<img width="906" height="654" alt="image"
src="https://github.com/user-attachments/assets/4a4bb5c8-5c62-46d1-aec6-ca88ff4098bd"
/>

Prices are pretty eyeballed and prob need tweaking
## Why It's Good For The Game
Bait is never much needed for fishing and the other supplies are nice,
specifically the auto-reel if your planning on chit-chatting while your
fishing.
## Changelog
:cl:
add: Fishing supplies can now be found in camping and hardware stores
/:cl:
## About The Pull Request
Fix for to_chat + some minor code cleanup
## Why It's Good For The Game
It was missing any type of span, and i abstracted some code into a nice
proc.
## Changelog
:cl:
fix: lock/unlock of doors displays as a notice (blue)
/:cl:
## About The Pull Request
Creates a helper proc to fetch enlightenment from the stat and removes
the enlightenment var on splat.
## Why It's Good For The Game
More consistent to just directly check a datum rather then the datum
having to set a var on a mob. which could be desyned if something else
(like the new for kindred splat) sets it.
## Changelog
:cl:
code: Fetches enlightenment directly from Path.
/:cl:
## About The Pull Request

Adjusts the values of clothes' selling component so that one success =
you lose money, two successes = you break even, three successes = you
earn money on a finance roll upon selling that clothing item. this was
balanced around the cheapest item in the clothing store, since before,
during playtests, i was buying 750 $5 latex gloves and selling them for
like $15 per success.

## Why It's Good For The Game

balance


## Changelog

:cl:
balance: finance rolls for selling clothes are now much more fair
/:cl:
## About The Pull Request
Reverts DarkPack13#795
But we will be squashing it this time


Creates a helper proc to fetch enlightenment from the stat and removes
the enlightenment var on splat.
## Why It's Good For The Game
More consistent to just directly check a datum rather then the datum
having to set a var on a mob. which could be desyned if something else
(like the new for kindred splat) sets it.
## About The Pull Request

Book has a delay for bloodheal but you can skip it and roll instead.
Modeled in this instance simply by doing anything to interrupt the
do_after.
<img width="524" height="412" alt="image"
src="https://github.com/user-attachments/assets/cc8b28dc-3c4a-48bc-abc4-b1ae6bc11ddd"
/>
## Why It's Good For The Game

Healing instantly from near-dead to full-health is unpleasant. This
makes it so you at least have to roll and risk your blood or even more
damage to do so.
## Changelog
:cl
balance: Bloodheal now has a delay, which can be interrupted to instead
roll for an instant bloodheal at risk of losing blood in a failure.
/:cl:
tgstation-ci Bot and others added 4 commits March 23, 2026 02:50
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Lockpick difficulty default changed to 5, as in tabletop.
Several doors raised numbers individually, numbers aren't exactly good
so just tell me what I should adjust.
Bashes are where primary changes are; you can now try them on any
strength (though you probably won't succeed on any door worth its weight
if you haven't invested in strength.)
Botches hurt you specifically, targeting your used arm (because it would
harm your shoulder.)
Reinforced doors are much harder to bash down now.
Bashing is now right clicking on combat mode and knock is left clicking
on combat mode instead of both being left click.

<img width="529" height="379" alt="image"
src="https://github.com/user-attachments/assets/ee08e60c-7778-4f4a-82e3-3cb1ecf67b2e"
/>

<img width="528" height="74" alt="image"
src="https://github.com/user-attachments/assets/21b2eedc-0619-489a-87b6-c8b4df1340fc"
/>

<img width="533" height="698" alt="image"
src="https://github.com/user-attachments/assets/a63f43c7-d83a-4885-bd25-2d57227633f5"
/>

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Honestly mainly I just thought that knock being replaced entirely with
bashing at strength 5+ is a bit confusing - I already encountered one
accidental bush as a result on the playtest (not me.)

This adventure lead me to just... make bashing available to everyone
except you need a lot of successes on reinforced doors and can hurt
yourself if you botch specifically.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
balance: Anyone can now bash doors, but bashing a reinforced door is
extra difficult.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner March 23, 2026 21:45
@FalloutFalcon FalloutFalcon added the Upstream Merge Copy and paste Darkpack code. If it compiles, it ships! label Mar 23, 2026
@FalloutFalcon FalloutFalcon enabled auto-merge March 23, 2026 21:49
@FalloutFalcon FalloutFalcon merged commit d879766 into ApocryphaXIII:master Mar 23, 2026
23 of 25 checks passed
@FalloutFalcon FalloutFalcon deleted the darkpack-pull-3-23-26 branch March 23, 2026 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Config Update UI Upstream Merge Copy and paste Darkpack code. If it compiles, it ships!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants